From: Glenn Morris <rgm@gnu.org>
Date: Sat, 16 Oct 2021 16:18:37 +0000 (-0700)
Subject: Merge from origin/emacs-28
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~16^2~3291^2~933
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=536968304bd2ab70819b2920fc015e4bf9330636;p=emacs.git

Merge from origin/emacs-28

e8488808df Avoid aborts when a thread is signaled while "waiting for ...
21397cce51 Improve documentation string for 'compilation-error-regexp...
2971a6890f * lisp/emacs-lisp/comp.el (comp-trampoline-compile): Fix t...
e842d7f29a Fix removal of fringe indication of bookmarks
b5a0eda978 Prefer "graphical displays" to "X terminals" in documentation
4ad0fc0dd0 Precise documentation of file-notify-add-watch
f5b8df14c6 Fixes to account for windows' tab lines
ced72b6e4c * Fix `native-compile-target-directory' effectiveness on t...
502788bc3d Add missing single quotes in the Emacs manual
1af45ad04e ; * lisp/emacs-lisp/comp.el (comp-trampoline-compile): Fix...
12654b7423 * lisp/menu-bar.el (yank-menu-length): Fix docstring (bug#...

# Conflicts:
#	lisp/gnus/gnus-undo.el
#	lisp/menu-bar.el
---

536968304bd2ab70819b2920fc015e4bf9330636
diff --cc lisp/gnus/gnus-undo.el
index 182c8743e09,07cf5d495a6..0717a7ccfba
--- a/lisp/gnus/gnus-undo.el
+++ b/lisp/gnus/gnus-undo.el
@@@ -75,12 -75,15 +75,12 @@@
  
  ;;; Minor mode definition.
  
 -(defvar gnus-undo-mode-map
 -  (let ((map (make-sparse-keymap)))
 -    (gnus-define-keys map
 -      "\M-\C-_"     gnus-undo
 -      "\C-_"        gnus-undo
 -      "\C-xu"       gnus-undo
 -      ;; Many people are used to type `C-/' on GUI frames and get `C-_'.
 -      [(control /)] gnus-undo)
 -    map))
 +(defvar-keymap gnus-undo-mode-map
 +  "\M-\C-_" #'gnus-undo
 +  "\C-_" #'gnus-undo
 +  "\C-xu" #'gnus-undo
-   ;; many people are used to type `C-/' on X terminals and get `C-_'.
++  ;; many people are used to type `C-/' on GUI frames and get `C-_'.
 +  [(control /)] #'gnus-undo)
  
  (defun gnus-undo-make-menu-bar ()
    ;; This is disabled for the time being.